*** empty log message ***

diff --git a/etc/ChangeLog b/etc/ChangeLog
index 382332860f08c18d08f890f9eb2d1f971c21ba4f..922a75d582bf9f430274f8e7a631da002e03a1d4 100644 (file)
--- a/etc/ChangeLog
+++ b/etc/ChangeLog
@@ -1,4 +1,8 @@
-2007-04-25  Yavor Doganov <yavor@gnu.org>  (tiny change)
+2007-04-25  Werner Lemberg  <wl@gnu.org>
+
+       * emacs.1: Replace -- with \(em.
+
+2007-04-25  Yavor Doganov  <yavor@gnu.org>  (tiny change)
 
        * emacs.1, etags.1: Escape some minus signs.
 

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 2f27f16a9282b7c7bcc1cb2a7751b927c013ada1..236221f174c09d93f717a03cb1308b0b302a0761 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2007-04-25  Mathias Dahl  <mathias.dahl@gmail.com>
+
+       * image-dired.el (image-dired-display-image): Derive image-type
+       from filename rather than assuming jpeg, in case no resizing was
+       needed.
+
 2007-04-25  Johan Bockg\e,Ae\e(Brd  <bojohan@dd.chalmers.se>
 
        * custom.el (defface): Doc fix.